From 5ce4d1588a9c2b313993ef657c64a6272b53e601 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 17 Jan 2002 01:37:31 +0000 Subject: [PATCH] Fix calculation error in the (shouldn't happen) case where Wed Jan 16 12:16:37 2002 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_size_request): Fix calculation error in the (shouldn't happen) case where option_menu->height < child_requisition.height. (Patch from Jacob Berkman, #66969) --- gtk/gtkoptionmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 283a09a7ec..5b10f8bccf 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -461,7 +461,7 @@ gtk_option_menu_size_request (GtkWidget *widget, MAX (child_requisition.height, option_menu->height) + CHILD_TOP_SPACING + CHILD_BOTTOM_SPACING + props.focus_width * 2); - tmp = (requisition->height - option_menu->height + + tmp = (requisition->height - MAX (child_requisition.height, option_menu->height) + props.indicator_size.height + props.indicator_spacing.top + props.indicator_spacing.bottom); requisition->height = MAX (requisition->height, tmp); } -- 2.30.2